From 90cf54d93c30720584a44c49b0a332079deb83b1 Mon Sep 17 00:00:00 2001 From: robertl Date: Wed, 16 Jun 2004 17:14:36 +0000 Subject: [PATCH] Add netstumbler reader. From John Temples, gpsbabel atsign xargs com --- gpsbabel/Makefile | 4 +- gpsbabel/defs.h | 5 + gpsbabel/duplicate.c | 61 --------- gpsbabel/netstumbler.c | 285 +++++++++++++++++++++++++++++++++++++++++ gpsbabel/util_crc.c | 81 ++++++++++++ gpsbabel/vecs.c | 7 + 6 files changed, 380 insertions(+), 63 deletions(-) create mode 100644 gpsbabel/netstumbler.c create mode 100644 gpsbabel/util_crc.c diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile index 55f6ea293..fa87d7eb0 100644 --- a/gpsbabel/Makefile +++ b/gpsbabel/Makefile @@ -19,7 +19,7 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o \ psp.o holux.o garmin.o tmpro.o tpg.o \ xcsv.o gcdb.o tiger.o internal_styles.o easygps.o quovadis.o \ gpilots.o saroute.o navicache.o psitrex.o geoniche.o delgpl.o \ - ozi.o nmea.o text.o html.o palmdoc.o + ozi.o nmea.o text.o html.o palmdoc.o netstumbler.o FILTERS=position.o duplicate.o arcdist.o polygon.o smplrout.o reverse_route.o sort.o @@ -34,7 +34,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ COLDSYNC=coldsync/util.o coldsync/pdb.o LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ - csv_util.o grtcirc.o vmem.o \ + csv_util.o grtcirc.o vmem.o util_crc.o \ $(COLDSYNC) $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) OBJS = main.o $(LIBOBJS) diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index 85b275c10..2a722dfa4 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -489,6 +489,11 @@ void pdb_write_double(void *pp, double d); double ddmm2degrees(double ddmm_val); double degrees2ddmm(double deg_val); +/* + * From util_crc.c + */ +unsigned long get_crc32(void * data, int datalen); + /* * A constant for unknown altitude. It's tempting to just use zero * but that's not very nice for the folks near sea level. diff --git a/gpsbabel/duplicate.c b/gpsbabel/duplicate.c index 6ff4ceb0e..9fc23bea1 100644 --- a/gpsbabel/duplicate.c +++ b/gpsbabel/duplicate.c @@ -48,67 +48,6 @@ typedef struct btree_node { waypoint *wpt; } btree_node; -static unsigned long crc32_table[256] = -{ - 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, - 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, - 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, - 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, - 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, - 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, - 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, - 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, - 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, - 0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, - 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106, - 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, - 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, - 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, - 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, - 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, - 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, - 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, - 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, - 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, - 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, - 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, - 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, - 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, - 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, - 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, - 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E, - 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, - 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, - 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, - 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, - 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, - 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, - 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, - 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, - 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, - 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, - 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, - 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, - 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, - 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, - 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, - 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D -}; - -static unsigned long -get_crc32(void * data, int datalen) -{ - unsigned long crc = 0xFFFFFFFF; - const unsigned char * cp = (unsigned char *)data; - - while (cp < ((unsigned char *)data + datalen)) { - crc = ((crc >> 8) & 0x00FFFFFF) ^ crc32_table[(crc ^ *cp) &0xFF]; - cp++; - } - - return (crc ^ 0xFFFFFFFF); -} - static btree_node * addnode (btree_node * tree, btree_node * newnode, btree_node **oldnode) { diff --git a/gpsbabel/netstumbler.c b/gpsbabel/netstumbler.c new file mode 100644 index 000000000..d1fe8df70 --- /dev/null +++ b/gpsbabel/netstumbler.c @@ -0,0 +1,285 @@ +/* + Read Netstumbler data files. + + Copyright (C) 2004 Robert Lipe, robertlipe@usa.net and + John Temples; gpsns@xargs.com + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA + + */ + +#include "defs.h" +#include "csv_util.h" +#include + +static FILE *file_in; +static char *nseicon = "Red Square"; +static char *nsneicon = "Green Square"; +static char *seicon = "Red Diamond"; +static char *sneicon = "Green Diamond"; +static char *snmac = NULL; + +static void fix_netstumbler_dupes(void); +extern unsigned long get_crc32(const void * data, int datalen); + +#define MYNAME "NETSTUMBLER" + +static +arglist_t netstumbler_args[] = { + {"nseicon", &nseicon, "Non-stealth encrypted icon name", ARGTYPE_STRING }, + {"nsneicon", &nsneicon, "Non-stealth non-encrypted icon name", ARGTYPE_STRING }, + {"seicon", &seicon, "Stealth encrypted icon name", ARGTYPE_STRING }, + {"sneicon", &sneicon, "Stealth non-encrypted icon name", ARGTYPE_STRING }, + {"snmac", &snmac, "Shortname is MAC address", ARGTYPE_BOOL }, + {0, 0, 0, 0} +}; + +static void +rd_init(const char *fname) +{ + file_in = xfopen(fname, "r", MYNAME); +} + +static void +rd_deinit(void) +{ + fclose(file_in); +} + +static void +data_read(void) +{ + char ibuf[512]; + char ssid[2 + 32 + 2 + 1]; /* "( " + SSID + " )" + null */ + char mac[2 + 17 + 2 + 1]; /* "( " + MAC + " )" + null */ + char desc[sizeof ssid - 1 + 15 + 1]; /* room for channel/speed */ + double lat,lon; + waypoint *wpt_tmp; + int line_no = 0; + int stealth_num = 0, whitespace_num = 0; + long flags; + int speed, channel; + struct tm tm; + + for(; fgets(ibuf, sizeof(ibuf), file_in);) { + char *field; + int field_num, len, i, stealth; + + /* A sharp in column zero might be a comment. Or it might be + * something useful, like the date. + */ + + if (ibuf[0] == '#') { + if (strncmp(&ibuf[2], "$DateGMT:", 9) == 0) { + tm.tm_year = atoi(&ibuf[12]) - 1900; + tm.tm_mon = atoi(&ibuf[17]) - 1; + tm.tm_mday = atoi(&ibuf[20]); + } + + continue; + } + + field_num = 0; + line_no++; + field = csv_lineparse(ibuf, "\t", "", line_no); + + while (field) { + switch (field_num) { + case 0: /* lat */ + lat = atof(&field[2]); + if (field[0] == 'S') + lat = -lat; + break; + + case 1: /* long */ + lon = atof(&field[2]); + if (field[0] == 'W') + lon = -lon; + break; + + case 2: /* ( SSID ) */ + strcpy(ssid, &field[2]); /* zap "( " */ + len = strlen(ssid) - 2; + ssid[len] = 0; /* zap " )" */ + stealth = (len == 0); + /* don't alter SSID in snmac mode */ + if (!snmac) { + int found = 0; + /* check for all whitespace */ + for (i = 0; i < len && !found; i++) { + if (!isspace(ssid[i])) + found = 1; + } + + if (!stealth && !found) + snprintf(ssid, sizeof ssid, "Whitespace/%d", ++whitespace_num); + } + break; + + case 4: /* ( MAC address ) */ + strcpy(mac, &field[2]); /* zap "( " */ + mac[strlen(mac) - 2] = 0;/* zap " )" */ + break; + + case 5: /* time */ + tm.tm_hour = atoi(field); + tm.tm_min = atoi(&field[3]); + tm.tm_sec = atoi(&field[6]); + break; + + case 8: /* flags */ + flags = strtol(field, NULL, 16); + break; + + case 11: /* data rate */ + speed = atoi(field) / 10; + break; + + case 12: /* last channel */ + channel = atoi(field); + break; + + case 3: /* type */ + case 6: /* SNR/sig/noise */ + case 7: /* name */ + case 9: /* channel bits */ + case 10: /* beacon interval */ + default: + break; + } + + field_num++; + field = csv_lineparse(NULL, "\t", "", line_no); + } + + if (lat == 0 && lon == 0) /* skip records with no GPS data */ + continue; + + wpt_tmp = xcalloc(sizeof(*wpt_tmp), 1); + + if (stealth) { + if (!snmac) + snprintf(ssid, sizeof ssid, "Stealth/%d", ++stealth_num); + + if (flags & 0x0010) /* encrypted? */ + wpt_tmp->icon_descr = seicon; + else + wpt_tmp->icon_descr = sneicon; + } else { + if (flags & 0x0010) /* encrypted? */ + wpt_tmp->icon_descr = nseicon; + else + wpt_tmp->icon_descr = nsneicon; + } + + if (snmac) { + snprintf(desc, sizeof desc, "%s/%d Mbps/Ch %d", ssid, speed, channel); + wpt_tmp->shortname = xstrdup(mac); + } else { + snprintf(desc, sizeof desc, "%d Mbps/Ch %d/%s", speed, channel, mac); + wpt_tmp->shortname = xstrdup(ssid); + } + + wpt_tmp->description = xstrdup(desc); + wpt_tmp->longitude = lon; + wpt_tmp->latitude = lat; + wpt_tmp->creation_time = mktime(&tm); + + waypt_add(wpt_tmp); + } + + fix_netstumbler_dupes(); +} + +typedef struct +{ + unsigned long crc; + waypoint *wpt; +} htable_t; + +static +int +compare(const void *a, const void *b) +{ + unsigned long crc_a = ((const htable_t *)a)->crc; + unsigned long crc_b = ((const htable_t *)b)->crc; + + /* we can't just return crc_a - crc_b because the return type is + * signed. + * */ + + if (crc_a < crc_b) + return -1; + else if (crc_a > crc_b) + return 1; + else + return 0; +} + +/* netstumbler data will have a lot of duplicate shortnames if the SSID + * is used as the shortname (the default). salvage the dupes by + * synthesizing a (hopefully) unique shortname. + * */ + +static +void +fix_netstumbler_dupes(void) +{ + int i, ct = waypt_count(), serial = 0; + htable_t *htable, *bh; + queue *elem, *tmp; + extern queue waypt_head; + const char *snptr; + unsigned long last_crc; + char ssid[32 + 5 + 1]; + + htable = xmalloc(ct * sizeof *htable); + bh = htable; + + i = 0; + QUEUE_FOR_EACH(&waypt_head, elem, tmp) { + bh->wpt = (waypoint *) elem; + snptr = bh->wpt->shortname; + bh->crc = get_crc32(snptr, strlen(snptr)); + i ++; + bh ++; + } + + qsort(htable, ct, sizeof *htable, compare); + + last_crc = htable[0].crc + 1; /* force mismatch */ + + for (i = 0, bh = htable; i < ct; i++, bh++) { + if (last_crc == bh->crc) { + snprintf(ssid, sizeof ssid, "%s/%d", bh->wpt->shortname, ++serial); + xfree(bh->wpt->shortname); + bh->wpt->shortname = xstrdup(ssid); + } else + last_crc = bh->crc; + } + + xfree(htable); +} + +ff_vecs_t netstumbler_vecs = { + ff_type_file, + rd_init, + NULL, + rd_deinit, + NULL, + data_read, + NULL, + netstumbler_args +}; diff --git a/gpsbabel/util_crc.c b/gpsbabel/util_crc.c new file mode 100644 index 000000000..fa29dcee6 --- /dev/null +++ b/gpsbabel/util_crc.c @@ -0,0 +1,81 @@ +/* + Compute CRC32's. + + Copyright (C) 2002, 2003, 2004 Robert Lipe, robertlipe@usa.net + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA + + */ + +static unsigned long crc32_table[256] = +{ + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, + 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, + 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, + 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, + 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, + 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, + 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, + 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, + 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, + 0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, + 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106, + 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, + 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, + 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, + 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, + 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, + 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, + 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, + 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, + 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, + 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, + 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, + 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, + 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, + 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, + 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, + 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E, + 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, + 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, + 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, + 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, + 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, + 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, + 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, + 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, + 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, + 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, + 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, + 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, + 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, + 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, + 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, + 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D +}; + +unsigned long +get_crc32(void * data, int datalen) +{ + unsigned long crc = 0xFFFFFFFF; + const unsigned char * cp = (unsigned char *)data; + + while (cp < ((unsigned char *)data + datalen)) { + crc = ((crc >> 8) & 0x00FFFFFF) ^ crc32_table[(crc ^ *cp) &0xFF]; + cp++; + } + + return (crc ^ 0xFFFFFFFF); +} diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c index 8f2b5c4f6..0fc7ee4de 100644 --- a/gpsbabel/vecs.c +++ b/gpsbabel/vecs.c @@ -63,6 +63,7 @@ extern ff_vecs_t nmea_vecs; extern ff_vecs_t text_vecs; extern ff_vecs_t palmdoc_vecs; extern ff_vecs_t html_vecs; +extern ff_vecs_t netstumbler_vecs; static vecs_t vec_list[] = { @@ -265,6 +266,12 @@ vecs_t vec_list[] = { "PalmDoc Output", NULL }, + { + &netstumbler_vecs, + "netstumbler", + "NetStumbler Summary File", + NULL + }, { NULL, NULL, -- 2.30.2